From bdbc25b8722cc1e3921858530f8ac484892156d3 Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Mon, 13 Feb 2017 15:47:38 +0000 Subject: [PATCH] configure: disable bash check for FreeBSD MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Bash it's not used on FreeBSD. Signed-off-by: Roger Pau Monné Acked-by: Wei Liu [ wei: rerun autogen.sh ] --- tools/configure | 7 +++++-- tools/configure.ac | 6 +++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/configure b/tools/configure index b59e06c2e4..ae96f6b839 100755 --- a/tools/configure +++ b/tools/configure @@ -6793,7 +6793,9 @@ fi fi fi -# Extract the first word of "bash", so it can be a program name with args. +case "$host_os" in + freebsd*) ;; + *) # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -6837,7 +6839,8 @@ fi if test x"${BASH}" = x"no" then as_fn_error $? "Unable to find bash, please install bash" "$LINENO" 5 -fi +fi;; +esac if echo "$PYTHON" | grep -q "^/"; then : PYTHONPATH=$PYTHON diff --git a/tools/configure.ac b/tools/configure.ac index 873e18dafb..28a539ce73 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -320,7 +320,11 @@ AS_IF([test "x$xsmpolicy" = "xy"], [ xsmpolicy="n" ]) ]) -AX_PATH_PROG_OR_FAIL([BASH], [bash]) +dnl FreeBSD doesn't require bash (hotplug scripts are in plain sh) +case "$host_os" in + freebsd*) ;; + *) AX_PATH_PROG_OR_FAIL([BASH], [bash]);; +esac AS_IF([echo "$PYTHON" | grep -q "^/"], [ PYTHONPATH=$PYTHON PYTHON=`basename $PYTHONPATH` -- 2.30.2